From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 18 Sep 2013 23:29:30 +0000 (-0400)
Subject: overviewControls: Always allocate the actor its full size
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3133
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f5a9dbb348632864095179f5f88a6fef9707e7c7;p=gnome-shell.git

overviewControls: Always allocate the actor its full size

This is the new Clutter way -- if the actor wants to adjust its
alignment, it will do it itself with its alignment flags.
---

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 7e1f6a258..a1d99e68c 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -67,7 +67,7 @@ const SlideLayout = new Lang.Class({
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX;
-        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
+        actorBox.x2 = actorBox.x1 + availWidth;
         actorBox.y1 = box.y1;
         actorBox.y2 = actorBox.y1 + availHeight;
 
@@ -314,11 +314,6 @@ const DashSlider = new Lang.Class({
 
         this._dash = dash;
 
-        // SlideLayout reads the actor's expand flags to decide
-        // whether to allocate the natural size to its child, or the whole
-        // available allocation
-        this._dash.actor.x_expand = true;
-
         this.actor.x_expand = true;
         this.actor.x_align = Clutter.ActorAlign.START;
         this.actor.y_expand = true;